* gtkutil.c (xg_tool_bar_menu_proxy): Handle case when tool bar label is null.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5ca0776bd975db1701930046d3e6dc1b67133f00..721bb93dfdaae60fb022e509ac5c007c96aa8181 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-14  Jan Djärv  <jan.h.d@swipnet.se>
+
+       * gtkutil.c (xg_tool_bar_menu_proxy): Handle case when tool bar label
+       is null.
+
 2011-02-13  Jan Djärv  <jan.h.d@swipnet.se>
 
        * callproc.c (Fcall_process):

diff --git a/src/gtkutil.c b/src/gtkutil.c
index 6367949a649c921fd0862228b779ca7e90cca20b..6ecd5d624af7512afb127a76faab0acd89a0f84b 100644 (file)
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -3677,7 +3677,7 @@ xg_tool_bar_menu_proxy (GtkToolItem *toolitem, gpointer user_data)
   GtkLabel *wlbl = GTK_LABEL (xg_get_tool_bar_widgets (vb, &c1));
   GtkImage *wimage = GTK_IMAGE (c1);
   GtkWidget *wmenuitem = gtk_image_menu_item_new_with_label
-    (gtk_label_get_text (wlbl));
+    (wlbl ? gtk_label_get_text (wlbl) : "");
   GtkWidget *wmenuimage;